Merge branch 'master' into 'matthiasc/for-master'
authorMatthias Clasen <mclasen@redhat.com>
Thu, 1 Oct 2020 13:56:37 +0000 (13:56 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 1 Oct 2020 13:56:37 +0000 (13:56 +0000)
commitcbe3de9ce71d6a6a125609a870b1830312a181c6
tree035811a075e8b153094d2322260f1740a7c1f0b4
parent028cd1e23aeca91c34c63bebf935778fc452ac4b
parent6de7022458d827c4a7cfdb76d1601be5c25898f5
Merge branch 'master' into 'matthiasc/for-master'

# Conflicts:
#   .gitlab-ci/test-msys2.sh